eth/fetcher: remove alternates, announced maps #32773
Conversation
|
@healthykim So we change how we would operate with many peers, right? I was running nodes like that, and would like to keep that possible. Maybe the change in load is marginal, just want to double-check. |
| txFetcherWaitingPeers = metrics.NewRegisteredGauge("eth/fetcher/transaction/waiting/peers", nil) | ||
| txFetcherWaitingHashes = metrics.NewRegisteredGauge("eth/fetcher/transaction/waiting/hashes", nil) | ||
| txFetcherQueueingPeers = metrics.NewRegisteredGauge("eth/fetcher/transaction/queueing/peers", nil) | ||
| txFetcherQueueingHashes = metrics.NewRegisteredGauge("eth/fetcher/transaction/queueing/hashes", nil) |
There was a problem hiding this comment.
I would like to keep this metric somehow
There was a problem hiding this comment.
I thought the current change resolves this comment but it was not. I made this unresolved again. I'll take a look
eth/fetcher/tx_fetcher.go
Outdated
| } | ||
| } | ||
|
|
||
| func (f *TxFetcher) announced(hash common.Hash) bool { |
There was a problem hiding this comment.
We rely on the announces map[string]map[common.Hash]*txMetadataWithSeq for determining whether the tx is announced or not.
You are right that the map iteration should be fast enough, especially the size of peer set is very limited. But we should also consider that this function will be invoked for every tx announcement.
However, another downside is we lose the ability to know how many transactions are in the announced status.
An alternative approach will be maintaining the map like
announced map[common.Hash]struct{}.
This PR removes the
alternatesandannouncedmaps intx_fetcher.alternatesmap is used only to check whether a transaction is in stage 2 (queued), and theannouncedmap is used only to check whether a transaction is in stage 3 (fetching).announcesmap). So maintaining two separate maps seems unnecessary.announcesmap, which is shared across stage 2 and stage 3, to perform the same check.Given that the peer set is usually small (e.g., 50 by default), this iteration is expected to be fast.